totally agree. working on this right now cc @arghzero