Added some todo's on the things that will change to the various modules