A commit... Not much progress though