adds tableView casting
cleans polluted headers
updates categories to be DRY
merge
Merge branch 'develop'