Feature/6/less

closes #6