Reimported from C# project
Added achievements and tests
Misc project cruft