Troubles here
Insert is now working
Merge branch 'unstable' to 'master' since it's now stable