Almost finished and testing