DEV: Begin Move to more constness