Changes to database generator, pushing for others to work on.  Also additions to the controller file, unfinished.