WIP 09.14.2014

kind of a mess right now