Initial push restoring pre-fossa awesomeness
Add defmain support.
Cleanup