Goals implementation
Steve messed up the views