Move HACK methods their own script
Merge branch 'development'