progress on #7
better formatting but not quite there...