Added TODOs for changes
Sync changes made on test system to base.rb