finish rough fleshout of everything