another massive blotch of work for this brnach, nowhere near done though