Updated project plan

Should be the final updated