First fully operation code check in and code clean up