MOving things out of Library to GUI T.T