3 Commits (feat/resources)