First working copy. Tests and Ci needed