Added first pass at apparently working crutch.