Before Jaime's second merge. Added some methods in the constants file, these are not yet used anywhere