finished up my cool new feature
Merge branch 'tbarker-UIfeatures'