wrapper architechture done, huge project refactroting