Add all my work (waiting for cleaining)