Make shake sort-of work, a lot of improvement still needed