Turn-in worthy

Maybe some blemishes, but tests perfect and has comments and namespaces.