more progress, correct physics still needs a lot of work