Working on fixing this mess with git.