Proto

This batch of commits cleans up our final product a little, now that it's a portfolio piece. :)