Stopped using Strings instead of a new type. What was I thinking?!