Major refactor and content update