Re-written some of the core code and switched the MySQL Library