Nicer interface, more demos