These two VCs were too similar... make them inherit from a single controller

:sparkles: