Staging

merge working code into master for deploy