recover from crap merge
add cost estimates api call
add time estimates api call
javadoc for model objs