Progress, next steps are probably to handle conflicting var names