No idea what I'm doing
Fixed merge issues