Class almost complete