refactoring and adding Matt's website