Adding latest raft of code