Simplifying a lot of stuff. Need to simplyfy the bootstapper now and add some testing stuff for quick iteration.