Copy paste code from earlier commit, forgot to pull repo when i got home...