untuil now everything seems to be working, or at least with a testimplementation

WORKING BUILD