first changes
Fixed
almost done
y
Final and working