More of everything, will never be done with this
What
Merge pull request #1 from ch222kv/newbranch

Newbranch
Fixed some errors with the validation and such
#refaktoring
Har försökt refaktorera koden för uppfylla krav men ger upp.