Vertical Slice 2.0

Added audio, tried to work through merge problem.