Stuff in ../app is horribly broken now :(

This is where the re-write of the main app will take place.
Don't mess in here unless you know what I'm doing.

-- Greg