Implemented variables
Worked on constraint definitions
Commented out unused bits