Adding my work notes, I won't submit these up to Gwindow's branch though