Finance technically done (add rest of extra features later)