Making a big mess before cleaning up and moving to single init file.