Renamed for funsies
Refactored features for kicks