Cleaning up, testing. Not yet certain that things are working properly...