Committing newer version... about to do another rewrite