Added second calculation screen, support for multiple inventory in databaser, added TODO comments