- level 1 kind of working
Merge remote-tracking branch 'origin/master'
merged with fife's awesome platform and resource generating function