IT WORKS I THINK
Back to a semi-working state