Lots and lots and lots of cleanup.
Start of dropbox integration.