before major changes to @user
95 percent MVP done