Added better mashing functionality - still testing.
removed old code