working on this!!! @deadmenlay on github :-3