Added a lot more functionality.