Finally got myself to commit here as well; I'm a lazy fuck sometimes