Initial commit for increased functionality and conditionals.