Make this neater
Merge branch '2.x' of https://github.com/DSH105/HoloAPI into 2.x