Some untested changes

I got some stuff crossed out, currently working on #25, but it's getting
into some other store issues/bugs that I'm ironing out now.

Still, quite a bit has been done. I can close #23, close #24, close #54,
and close #58

That's good for one night. However, there's a lot more that needs to be
completed, especially once I move to the next milestone.