Initial commit v2
Initial commit - fixing conflicts