rewrote waffle iron + ui