Changes
Project almost over

Just need a few bug fixes with progress bar