Working version with simple UI