Implemented Goals migration - almost complete