Updated Database, bootstrap, and others.  Created Clean class (in progress)