Started to fill in mapping skeleton