Gui WIP - started on locking support on patch updates