Finished part 2?
Fixed some shit