more refactor
getting into resources now
:)