Update controller and graphics...

Imcompleted yet.