Time to commit some Work-In-Progress stuff before my diff gets too large..