had to wipe my repo - my new changes added to brian's latest merge (I hope)