It's actually best to work from TruePowerofTeamwork's branch.