first commit
second commit
inline editing and other magic