5th commit, FINALLY SOME PROGRESS. On the right track!