3_13_2014_v2

Cleaned up project a bit.