Final Commit

Done
revised from beta feedback

revised from beta feedback