Basic controls working, needs persistence