Massive update to my branch

Pulling in all the code from our paired programming jam session.