(Added) - Did more work on design implementation.