Updates to finish off milestone 1