2nd iteration fixes + future class