almost there
still one weird thing going on...