First finished commit
Fixed something