Still not functional - but was surprised at how far I've gotten on progress so checking it into the branch for now.