Extra credit lvs 1 and 2 functionality added