Update with lots of changes to setup