Upload from Local Dev

Updated dev branch to include new files and updates from local
development.