Added constants and built on existing methods

9/17/2014
Deleted unnecessary headers