Another DB bug fix... my bad guys.
Merge branch 'iteration3' of https://github.com/NameCT/CIS/ into iteration3