AvdP - Not a good place, but committing anyway

Don't use this...it's just so I can take out the bits that I changed
that I do like later.