Improved class implementation but still not wired up with the DB