9th commit, going well. Same as 8th but less bugs