Completed implementation of Week 2 Lab, Testing remaining