I'm close. I just need to finish up the menus, redo some of the init code, and the gameplay loop. I also need to make some button graphics. That should be about it... Maybe a week to do the initial SVN commit, then some testing and debugging for any showstopper bugs. My estimates tend to be wrong, but I'm feeling confident right now.