Work on Primary Methods Package.

Cleaned up, finalised.