still merging and fixing.