Starting to break up setup commands