Committing what I have now so Yaphet can join up.