Working on feature changes.

Waiting on UI Stuff before proceeding