working through some issues cc @arghzero