Fixed bootstrapping and added a basic queue structure