Moved setup to better place; check that it is all loaded