Tests working
Decoupling using amplify
Working through decoupling...whew, not used to doing it this way,  not sure if this is the best way either... :P
Slow going, adding expenses next