Updated TODO
pushed assemblies around