Lazy loading working
Merge pull request #88 from Phyks/greatRefactor

Lazy loading should be working