got floating pieces working
merge from master