Simplified the Argument data structure and add cluster initialization
I hate that git makes me do everything twice on this laptop. Oh sorry, am I on the air? Same as the previous commit.