#15 #13 - WIP codebase further implementation