I decided to make some rather major changes...