somewhat working shit
comments bullshit
seeing if fixed
shutup git
fixing conflicts
fixing more conflicts