Put everything in one file, update UI a bit
Update UI, hook up error messaging
Remove old files