linted, added todos