Pushed finally working source code! of course - not properly yet