almost final

almost final, hope this will last commit for this project