Merge pull request #24 from jamesclampffer/master

getting files to work in the morning
dummy layout init done