added todos and possible future additions