Major rewrite, fixed projections and loops