Merge pull request #20 from jrpruit1/master

Finished UI capability