moved remaining bits of sketch into app