Hmm, time to completely change everything