Working version + basic output
New output