Added transcription stuff, fixed merge issues.