Merged the ChristopherUIUpgrade branch with master.  This UI is still in it's rough phase.  It's assets will need to be remade prior ro completion.