A36507 V 0.3.5

Now uses common modules