Coreyk

Added various commits on different features