Checkin for MySQL data wire-up
Resolving conflicts, about to fix missing gitignore