Added more code. Need to think about pieces and owners