Went back a few changes. Closer to working