Added funding model methods
Updated funding view
added indexing
Merged master and branch
deleted some stuff