Commit more code - DB work pretty much done