Changes

Encapsulated UI
Returned move functions to originals