Added some of the constant generation to base, doesn't currently work so its turned off