Assignement complete needs testing and debugging