Some preliminary code architecting