Misc development work
Misc development work