okay! tested and working now. Just gotta validate against spec