Added new methods, some work in progress