Better Goal Structure

Changed the way to propose and log goals