Updates.

Needs to be more pythonic later