Merged feature changes from dev to master

Merged feature changes from dev to master, MVP operational.