Mix and Match

Copied some files from Elliptic into my python files for reference.