More working stuff, less crud.  Thank you, Matt and Luke.