major break and reorg. going to scrap this branch and rebuild from current develop, using this branch as a guide