Still a work in progress. Adding a couple more methods that will be needed.