Started fleshing out main module