ENHANCEMENT: Now w/ less magic (numbers)