Made things actually bounce..

.. then forgot to commit for like 3 months. Here it is.