Basically done

few errors need fixing