Working

Merging working branch.