Security enforcements

This would be merged when completed