Rearranging but still problems
Merge branch 'develop' of github.com:christianlykke9/Zebra into develop