Updated methods

Included more methods and testing.