Committing because things almost work
Fixed override detection
Fixed typo
Fixed local inclusion
Added documentation