Back to using enums, hopefully this will speed things up a bit.