Finished assignment v2
Fixed tables