I really hope this works.....

Hopefully(?) a merge of UI and Master