Assets 2

This is the last commit before we began development of database version 8.