Added Helper Methods for Transitions
Big fat merge that hopefully doesn't break anything