Bug #17 complete! Will need some tweaks later, but all in all, it works and it works well