Ok, got the proper amount of ATF in, it was definitely starved, almost put in a whole gallon. Here are the symptoms:
When the engine is hot, it will immediately choke when put into any gear.
When the engine is cold, it will idle when put into gear and not move. If the engine is then revved it...