Feature/dev

Pulling ryans code into dev so i can work off my own clean repo