First update

Justins first updates