Manage forks

I've been working on this mo'fo ALL DAY: