Bare bones beginning
Fixed mergo conflicts