Changes around the bottom and cleans things up a little

@josephwegner thoughts?

It's still super rough, but it's another direction we could go in.