Asya0826 tim

This branch doesn't run, but I did make progress finding the problem.