Security WIP

by Duarte Pires