Added some static injections -- will have to clean these up later.