Implemented interfaces
Merge pull request #138 from jaytaph/wip/interfaces

Implemented interfaces