First commit, lot of work is needed to have something working