Work on #73

Better but not sure if I nailed it......