Added plan and implemented some features