phase 1 basically done

couple of features still need to be refined