TODOs for future improvements were added.