Working version

Working but still some comments to include