What a mess, reorganized my stuff :| (Tests to Ex1 and 2 are on progress!)