Majority of code complete, albeit a few bugs to fix and comments to add