Slowly adding more to my setup