WIP: removing a bunch of unnecessary pieces and thinning it out a bit.