Update #2 on Github, still lots of work to do here