Reworking bitmap to be a class rather than just structures