non-Bonus sections finished, but a bit ugly still