+ Finishing up work on database classes