Merged manually with Howell code.

Should now be identical to Howeel code synced as of 4:00 PM on Saturday,
March 16.