Refactored for tests
Refactored for tests
Added tests
Added fade in to site