Got tests working
Continued rework
First step reworking intent
Continued rework