Merge my work so far to the main repository