Dev edoru

#2, #7