Bits n piece in place but not compileable yet