Adding changes, still restructuring