undoing some stuff
Merge branch 'master' of https://github.com/skipmeister123/hanskokx-beta