Added a bunch of TODOs
Added multicompanywide member