First security pass
First ugly pass at security