Easy tomato rt

This has the changes from the Hackathon on June 1.