Work go on.
TODO :) Mapping all Secure Resources and write tests