Main programm now takes arguments