Done with pcg
Re organize
First version
Some stuff working