idk a big commit of stuff