cleaned up
everything broken but shopping is advancing fast