Started to rename variables, and moved some code around.