Refactored Pub
Merge branch 'refactor' of https://github.com/zippeellii/Krogkollen into refactor