Last few touches required (and ER diagrams)