BROKEN: begin implementing lwi changes