Bring back assign17
Resolve conflict
Bring main.cpp up to speed