Finishing up initial setup