Update after big hack session

Full functionality, including record/playback