Hollly crap. Redid the object model so it can handle constants a bit better