Added argument-parsing, init