saves private org stuff
using entity helpers
tidy up and using single conf