for good measure
Final for the moment

Still needs further testing, but it looks alright for the moment