Ok Looks good! Imma go ahead and merge this into Master!