IGNORED the shit and stuff
shitload of code
merge
merge