Merged art

Art now in man project branch