Initial commit of main assembly and tests