Modified the views to use api's data
merged in new api
Added new calc files, will load this in better eventually