Rewrote the Income module

It works now. Can save them.