Almost working!

Still some bugginess in the adding routine, other than that things are
starting to take shape nicely.