Re-factored codebase and updated interpolation techniques.