cleaner, still no menu
almost prod ready
ready to merge