5th Phase first commmit, clustering not complete
modularized and cleaned up a ibt