Yay more enterprise like
Finishing up and cleaning up