Last Working version

watch out with git. it sucks