commit completing assignment. Little non-importatnt details to improve