improved plan, added ability to store plans,