Implemented mouse to fill goal and return

Needs to be tested