Merged, almost working again
some random changes im now committing...