more progress
ready for first tests and rounds of debugging
fixed file loading issue