Continued work on the initial cut of code