all working now

all basic is working