final night last commit. Working...