seems to work
Working some tests in and things seem to be OK for now
Working some tests in and things seem to be OK for now
merging to master
fixing merge issue