Last commit for today..more work tomorrow