Have done some testing, things seem to be working but more rigrous testing ahead