Mostly working after stripping even more junk out ...