updated TODO, cs
optional dependency on imagine bundle