Most hard coding removed
Merge branch 'dev'