Reorganized, started a little