Progress made on rework, committing to new branch

Project shelved indefinetly. Two compile-time errors due to overlook.
New branch set up so I can work on this later/other people can look at it
and get the idea of what I'm trying to do.