Rewriting everything, combining in one file.