Messing with a bunch of stuff, getting closer to the existing prototype style.