Update for first working setup that does some of the basics