Major refactor to break out constraints

Also new column added to config and renaming