Captain class reworked a bit