Commit before I start overhauling HoloConst class