Works... mostly
Merge pull request #2 from positron-/temporary

Works... mostly