split out battery pack into separate file + fix and test oring stuff