Feature/initial cut

\`\`\`java