Moved system to a various sources rather than simply websites, more modular and supports further expansion