Almost done.

Almost done, just need to copy and paste the controls back in.