Ready For Submission

Everything has been tested and commented.