Major refactoring, TOC still doesn't work
Fixed TOC problems