Restarted + Save singles

Restarted and removed as much recursion as possible…my mind couldn't handle it :(

* Can save single fields

Signed-off-by: Oz Ramos <>