Init less

Merge this into master - work been halted on master pending this completion/