Almost done... working out the kinks