Started adding consts