Clean up and restructure code, add derpily encoded (ffmpeg) new record