Final commit before turning in.

Fake it till you make it... just don't hard code data ffs...