4th Commit - all but dev3 done