Madlib: Part three complete (Code cleanup next)