Refactor + added vids