Project is broken - half way through using singleton.