Making some changes... I really need to make some branches for this project...