clean up, works locally
add org works, list works, show works
add org works, list works, show works