reworking literally everything.

wow it's been 9 months since i touched this-