Basics setup
Fixed merge issues