Implemented 2-a and 2-b

Implemented 2-a and 2-b, but 1-c and 2-c still need work.