I only really care master is not broken by the current approach