Re-commit

work done last night