Started fixing shit up, doing it with a proper plan this time.