Semi workign progress2
Semi workign progress3
Updated clean and split