Added Editor

Made lots of changes.