Add comments; working but not way I want at moment