Fixing
More work for Vex, trying to get full UI