Nearly working, now to integrate...