A bunch more work. Backwards compatable switch working now. Still working on API Access Control