Split up logic into more methods. Added and used make_resource
Added missing include
Merge branch 'master' into main_refactor

Conflicts:
	resources/graphics.conf
Merge pull request #67 from Databean/main_refactor

Split up logic into more methods. Added and used make_resource