Final Final

Re uploaded few bug fixes and new format I dont really like the insert
format but I couldnt get it to work.