insert() needs a bit of spit and polish

[mattyv]

split function up into other functions
refactor to reduce the number of variables flying around.