Some new stuff, nice commit message lol