adding work from this weekend initial setup stuff.
merging