Unit testing done. Need commenting finished.