first commit, added stuff
some wacky merge because git hates me today