more pieces in place, still messy but works for demoing