Mass and Motion in General Relativity