Plenty of time for that. 

I added in skills to the CS, covering his use of the Force and his lightsaber.