More work, fixed ponds

Closes #20