Rolling back to the old design for the moment, I think I will end up
changing it quite a bit shortly