Stop Wasting Time on Goals (and do this instead)

@Barbz_Thebe