Introduction branch

Should these be enums instead of constants?