setting basics done
merged