Moving from bash loading to python modules
More work on modularising