Added plan, needs re-work