Feature/initial cut

\`\`\`java \[common]