resolved merge conflicts
have a basic budget meter front-end completed