Test

Fixed some bugs... Testing....