Project almost complete, some minor changes left