Initial edits and workspace setup