Add more abstract methods. Re-format yet again for line endings.