Ready to test code

Filled in all the missing spots.  Seems like more needs to be done to
make this useful.