Stuff works! Need to polish tomorrow then branch