[LATE] got save working
[LATE] moved some code around