Removed things. This is the simple, working code.
Committed more files.