Completed ui-lib conversion, maybe