Menu stuff has been done here today.
Fixed conflicts yay!
Broken!!!!!