Updated goals for .18, take a look and .change/add to it