-- fixed git somehow :D added alot of nullpointers :(