Commit of new SWC

New SWC to match up with code