Lots of changes, getting the hand of database functionality...