Development complete except for logging