restructured and worked on project a bit