Some stuff i forgot to commit