More Layer Stuff
No conflict?
Merge pull request #25 from GGSilva2/master

Layers or something