Midway dev commit.
Moved to a more OOP aproach.
Fixed the command line handler a bit.