Continue fleshing out classes
Add MODE_MAP setting
Add test for logical constraints