added TODOs for possible refactors based on solution guides