basically all the functionality to add, remove and transfer the major entities are there now