Initial commit

Functional as of 8/27/14