Ejhernandez/set sec updates last time

Unit tests are not working but because mocking is not working yet...