Jackbranch

All updated database, correct views, etc.