Reworking codebase.