FORGE-1155: Initial commit - not compiling yet