Merged from landonreed/plan-it