Work in progress

Very broken right now, just committing for sharing purposes.