Improved functionality

Add more functionality (graphics etc).