Big commit

everthing working