Added Interface
Major refactoring, especially rendering routine