Still working on separating the logic from db and business code