Adding a few in-progress attempts.
Some refactoring on attempt for #41