More WIP, mostly cleaning up variable names.