Added goals, non goals and rough design