tweak
start working on adding permission checks