Finished up logic, cleaned up battery partial