all of the second wave should be done between protodrake and myself i've commented inline where warranted n