Almost done...

Cleaned up more useless stuff, got the data-cleaner working, just need
to redo the authentication screen again.