Early build of Wave
Updated model
Added Wave to Level
Small fix