Update 3:17pm 5/21/2013

Random updates. Non-functional skeleton is complete.