messing around with core system
Merge pull request #9 from mrkrstphr/tweaking-core

messing around with core system