commit before pulling Kyle's massive changes
fix merge conflicts
fix petty merge conflicts
tossed together the beginnings of some shitty front end