Some work on touches, changed basic data for piece to include type