move things around, started adding cgs