Dev

Merging todays additions.