finished video 17, cleaned up 16