Wip indent refactor

started indent refactor, see #38 

still a lot of failing tests but I think this is moving in the right direction. only spent a couple hours so far, I think it needs probably another 10+ hours to finish it.