moving stuff around, adding kirby