Refactor: Resourceful

# :construction: WIP :construction: