A lot more moving to use models rather than db libs. Long way to go yet.