I was actually working on this all the time but was too lazy to push it :P