zomg so much progress
final commit of night. added tons o' shit