quick save is almost working. restructured classes