More Integration

Brought over the mechanic and began testing the night waves.