Preparing for merge w/ #!