Started work on generalizing the codebase, and added the pondmapper