6th Commit. All updated, Unit tests included