Return to project, cleaning up code and re-organized for the apptastic theme.
Roughly stable version