Added capacity and modifiers with tests
Merged files