Adding more functionality, lots of work left