Made the Mount collection without wait.

Removed some TODO's that were done