-
Added some basic logic and more permissions
Some more logic