Revert "Revert "Initial Changes""

This reverts commit 79e5998539f3baa9fc7889d573259fd498c66319.