Revision to format of project. Updated with Steve's new interface, along with Nicholas's api cs work.