Sime more changes in leo. Keep working and create documentation later.