Comments; No TODOs; basic function working