WIP cleanup
WIP doing security right