WIP
More WIP
Fixed everything