stoping work so i can submit, so much todo ... :(