Add new functionality, bugs and stuff..