Current status

Semi-working

Likely final