Added shark and water working
merged
fixed errors