Removed extra methods and created initial implementation.