commit

dff
seperate and almost working