complete rehaul, working state, MVP