first stab at cleaner menu