refactored
fixed lingering mash bug
die you bugstard!