Finished stupid merging stupid stupidities