Updating basic functionality. Just dry run for now.