Added couple more methods, TODOs.