Fixed broken data issue. Working with faux dbs so far.