Adds/Changes

*maybe a better naming job