Fix import issues, implement arg input and handling