Done for the most part

will add target diagram in the morrow