Small additions

Tried adding some control objects. Going to need a lot of work when the
database is up and running