First solid commit.

6/26/2013

--Working--