Last version before going back to jonsito so that it works.
First version that passes pintest.