Added remaining sources, fixed so it compiles.