Revert "Fixes to main"

This reverts commit bee62e2ef24fa7613689c62849f223c9e0be6a1a.
Revert "Revert "First Commit""

This reverts commit bc82f2d80274b121ffe8d49ad1f3d188250ab457.