Got things working again!

2 years overdue, and not polished... but hey...