new mapper system
Merge branch 'master' into new_mapper
re-work model / mapper / dbal logic. much better now.