Initial commit of trying to fix nil