Quick Interaction Cleanup

- cleaned up some class communication issues, should function correctly
now