beginning a total reworking
more work revamping
Merge branch 'total-reworking'