More work on command line parsing and stuff, might all be scrapped(?)