Major restructure, decided the old way wouldn't work well.