add some half-written stuff