Starting some work on the codebase.