Re-worked MySQL System