Added tangetial fields. Untested. Probably broke as heck.