Initial implementation for inline editing working
Split code up and reorganize a bit better