Completed remainder of functional features for milestone 4