made it nicer kind of
fixing conflicts part 2
fixed conflicts and pushing it looking better ish