Get functionality working / understanding of codebase coming along