Logic finsihed, need comments