Started re-arranging and documenting