Second commit, more code comments and a demo of actual implementation