Bugfixing and I think it works for realsies now.