More work on initial setup