Working version

Commented out the stuff that cause problems for now.