Misc work on getting this work