Working on setting it up more and more