Organized code a bit more, experimenting with quadratic curves