Did some work on #25