Second iteration of Software eng. project