add savings controller and some makeup