more buggy stuff
Added lots of stuff and checked if works. Works