After thesis

made prototype (there are som bugs)