Worked on a lot of the phases and also fixed specs