[#23] Initial edits