Another barebone class and some fixes