Resolve strong cycle issues

- Closes #3