Feature/initial cut

ah nvm, just saw comment below.  will change everywhere.