Obsidian and Bedrock

Going to merge myself