Add comments and more methods