Merge branch 'release-roughDraft' into master

- Rough Draft

Signed-off-by: Michael LeCompte <michaelslec98@gmail.com>