back to where we were
Added security
Merge branch 'better_branch'
Removed kitchesink again