All code merged into one! First version doesn't work but we're working on it.