update from desktop

Bringing in my work so far and updating everything