Added the start of Achievements, but not sure if I'm goign to really want to include them...
Reorganized a bit in anticipation of adding android specific code