Added methods to main class

This is expermental as well