Making some progres...  Need lots of UI cleanup and finish adding the DB support