Modified TODO
Edited ideas
Reorganized Traits to fit new approach