Bulk Merge

This is all the stuff I developed before using Git.