Merged the 2 pages and unified variables and classes from sagi and hanna's work