TEAM-2: Started modularizing