Removed duplicate methods from a bad commit and made sure the features worked together.