2.1.0
fixed factory delete error
2.1.1
foreign key tests pass
messy master merge
working foreign keys, add, remove, totals, retrieval