More menu work, currently buggy