Cleaned up code base, added starter code to integrate bitsets.