Merging broken editor to allow other progress
Updated TODO
Added basic editor