Added all the necessary features to meet the test deliverables for 8/5/14.