Managed to get almost everything under one branch