More subject addition shenanigans